[OpenCL] Enable OpenCL for GPU tests #12490

valmat07 · 2022-08-18T13:03:53Z

Enable OpenCL support for GPU tests.

valmat07 · 2022-08-30T10:28:49Z

This PR enables OpenCL test in CI. For that:

Added USE_OPENCL flag in the build gpu script
Added adreno target in the CI target
Moved relay opencl texture tests in different location to support run them independently. This is necessary due to not all relay tests supports OpenCL CI configuration
Now opencl texture tests working in fp32.

echuraev

Thank you for your PR! Please, rebase it to the latest mainline. And one question. Will we run our cpp opencl tests in the CI?

echuraev · 2022-09-05T06:22:02Z

CMakeLists.txt

@@ -798,4 +798,4 @@ if(${SUMMARIZE})
  print_summary()
 endif()

-dump_options_to_file("${TVM_ALL_OPTIONS}")
+dump_options_to_file("${TVM_ALL_OPTIONS}")


No meaningful changes. Please revert it.

tests/cpp-runtime/opencl/run_gtests.cc

tests/python/contrib/test_opencl/test_run_gtests.py

tests/python/relay/opencl_texture/test_conv2d_nchw_texture.py

tests/python/relay/opencl_texture/test_conv2d_nhwc_texture.py

tests/python/relay/opencl_texture/utils/adreno_utils.py

… tests are skipped in the environment script

valmat07 · 2022-09-05T18:43:52Z

@echuraev I found better solutions to exclude tests, now they are excluded in CI scripts. Please check

echuraev

Several minor comments

tests/python/relay/opencl_texture/test_conv2d_nhwc_texture.py

tests/python/relay/opencl_texture/utils/adreno_utils.py

CMakeLists.txt

echuraev

LGTM. Thanks!

echuraev · 2022-09-07T05:35:05Z

cc: @masahi, @csullivan, @TejashShah, @driazati

driazati · 2022-09-07T05:55:46Z

tests/scripts/task_python_integration.sh


 # forked is needed because the global registry gets contaminated
 TVM_TEST_TARGETS="${TVM_RELAY_TEST_TARGETS:-llvm;cuda}" \
    run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-relay tests/python/relay

+# OpenCL texture test. Deselected specific tests that fails  in CI
+TVM_TEST_TARGETS="${TVM_RELAY_OPENCL_TEXTURE_TARGETS:-opencl}" \
+    run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-opencl-texture tests/python/relay/opencl_texture --deselect=tests/python/relay/opencl_texture/test_conv2d_nchw_texture.py::test_residual_block


Instead of deselecting here can you:

File a GitHub issue with the test name and some context on why it fails with OpenCL

Move the skipping to the test itself via pytest.mark.skipIf and be sure to add a reason="See <link to apache/tvm GitHub issue>"?

That might make it so you don't need to change this script at all

But the main thing here is that this test works well locally on adreno devices, so you don’t want to skip it. But in CI environment due to we have nvidia device so different libOpenCL, this test doesn't work properly.

Generally we want to exclude some tests only for nvidia devices, but I couldn't find the proper way to exclude tests for nvidia. So maybe there is some way to exclude tests by making sure it doesn't run on nvidia?

You can do whatever logic is necessary in the condition for the skipIf so that it's only skipped in the specific cases you want (e.g. here maybe just skipIf(tvm.testing.utils.IS_IN_CI, reason="...")). Also in tvm/testing/utils.py take a look at requires_cuda or uses_gpu as they may already do what you need

Added skipif instead of deselect. Thanks for the suggestion!

valmat07 · 2022-09-08T09:27:07Z

@tvm-bot rerun

driazati · 2022-09-08T17:08:47Z

tests/scripts/task_python_integration.sh

 # forked is needed because the global registry gets contaminated
 TVM_TEST_TARGETS="${TVM_RELAY_TEST_TARGETS:-llvm;cuda}" \
    run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-relay tests/python/relay

+# OpenCL texture test. Deselected specific tests that fails  in CI
+TVM_TEST_TARGETS="${TVM_RELAY_OPENCL_TEXTURE_TARGETS:-opencl}" \
+    run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-opencl-texture tests/python/relay/opencl_texture


one more thing, won't this get run as part of test/python/relay in the run_pytest above this one?

a large number of tests in tests/python/realy/ for OpenCL do not run, for various reasons, so I took out the texture tests separately so as not to mark relay tests for some special occasions.

tests/python/contrib/test_opencl/test_run_gtests.py

driazati

tests/ script changes look good to me

TejashShah · 2022-09-09T17:00:34Z

cc @masahi @junrushao, it needs a merge trigger!

* Add opencl target in test build script * Fix fp16 test and compile test for opencl * fix lint * Fix relay OpenCL texture tests * Fix lint * Enable relay OpenCL tests * Fix opencl relay texture tests * fix lint * Remove OpenCL gtest variable * Fix unbound variable * Skip tests that are not supported in CI * fix lint * Add path for opencl gtest directory * Fix opencl gtests include directory * Enable OpenCL googletest. Fix bug in opencl timer test * testing fix for build cpp tests * update googletest git version for opencl tests build * update cmakelist * Update CMakeList * Update CMakeList * Disable opencl googletests * update Opecnl.cmake * fix Opecnl.cmake * Apply comments. Remove xfail decerator for opencl tests. Now specific tests are skipped in the environment script * minor code changes * apply comments * apply comment * skip test in ci by decorator * fix pytest skipif warnings * Fix skipif for opencl gtests

valmat07 added 24 commits August 18, 2022 15:49

Add opencl target in test build script

6d147c3

Fix fp16 test and compile test for opencl

2730ecc

fix lint

bb48962

Fix relay OpenCL texture tests

3a01e41

Fix lint

2d30a73

Enable relay OpenCL tests

53d8042

Fix opencl relay texture tests

4c981a1

fix lint

61bf976

Remove OpenCL gtest variable

19a1153

Fix unbound variable

213620c

Merge https://github.com/Deelvin/tvm into enable_cl_tests

2ceddbc

Skip tests that are not supported in CI

2107de0

fix lint

be5fb16

Add path for opencl gtest directory

757f9d3

Fix opencl gtests include directory

b17219d

Enable OpenCL googletest. Fix bug in opencl timer test

ad16842

testing fix for build cpp tests

4b82982

update googletest git version for opencl tests build

a5903ba

update cmakelist

650c20e

Update CMakeList

e9990e9

Update CMakeList

afb2c98

Disable opencl googletests

48b5606

update Opecnl.cmake

b238280

fix Opecnl.cmake

4f132bd

valmat07 marked this pull request as ready for review August 30, 2022 10:29

echuraev requested changes Sep 5, 2022

View reviewed changes

valmat07 added 3 commits September 5, 2022 14:27

Merge https://github.com/apache/tvm into enable_cl_tests

ba350f0

Apply comments. Remove xfail decerator for opencl tests. Now specific…

f007b8e

… tests are skipped in the environment script

minor code changes

269e491

echuraev reviewed Sep 6, 2022

View reviewed changes

tests/python/relay/opencl_texture/test_conv2d_nhwc_texture.py Show resolved Hide resolved

tests/python/relay/opencl_texture/utils/adreno_utils.py Outdated Show resolved Hide resolved

CMakeLists.txt Outdated Show resolved Hide resolved

apply comments

560219c

valmat07 changed the title ~~[OpenCL] Enable OpenCL for GPU tasks~~ [OpenCL] Enable OpenCL for GPU tests Sep 6, 2022

apply comment

17e49ec

echuraev approved these changes Sep 7, 2022

View reviewed changes

driazati reviewed Sep 7, 2022

View reviewed changes

valmat07 added 2 commits September 7, 2022 23:14

skip test in ci by decorator

42df63a

fix pytest skipif warnings

307ba3c

driazati reviewed Sep 8, 2022

View reviewed changes

tests/python/contrib/test_opencl/test_run_gtests.py Outdated Show resolved Hide resolved

Fix skipif for opencl gtests

dd6aa8b

driazati approved these changes Sep 8, 2022

View reviewed changes

masahi merged commit 574794e into apache:main Sep 9, 2022

AndrewZhaoLuo mentioned this pull request Oct 4, 2022

TVM v0.10.0.rc0 Release Candidate Notes #12979

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[OpenCL] Enable OpenCL for GPU tests #12490

[OpenCL] Enable OpenCL for GPU tests #12490

valmat07 commented Aug 18, 2022

valmat07 commented Aug 30, 2022

echuraev left a comment

echuraev Sep 5, 2022

valmat07 commented Sep 5, 2022

echuraev left a comment

echuraev left a comment

echuraev commented Sep 7, 2022

driazati Sep 7, 2022

valmat07 Sep 7, 2022

valmat07 Sep 7, 2022

driazati Sep 7, 2022

valmat07 Sep 8, 2022

valmat07 commented Sep 8, 2022

driazati Sep 8, 2022

valmat07 Sep 8, 2022

driazati left a comment

TejashShah commented Sep 9, 2022

[OpenCL] Enable OpenCL for GPU tests #12490

[OpenCL] Enable OpenCL for GPU tests #12490

Conversation

valmat07 commented Aug 18, 2022

valmat07 commented Aug 30, 2022

echuraev left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

valmat07 commented Sep 5, 2022

echuraev left a comment

Choose a reason for hiding this comment

echuraev left a comment

Choose a reason for hiding this comment

echuraev commented Sep 7, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

valmat07 commented Sep 8, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

driazati left a comment

Choose a reason for hiding this comment

TejashShah commented Sep 9, 2022